gtkgesture: Do not cancel gesture when setting DENIED state
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 15 Nov 2021 22:45:47 +0000 (23:45 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Mon, 15 Nov 2021 23:47:57 +0000 (00:47 +0100)
Touchpoint state and tracking are tangential, this is mixing up both.
This change was added in the fixes for
https://gitlab.gnome.org/GNOME/gtk/-/issues/3016 but is now unnecessary.

gtk/gtkgesture.c

index 71a0300ea156ef96ab8066b17c2cc7caeb9090e4..48db916c2f183034ab6c916894b0396c6413d177 100644 (file)
@@ -1020,7 +1020,6 @@ gtk_gesture_set_sequence_state (GtkGesture            *gesture,
 {
   GtkGesturePrivate *priv;
   PointData *data;
-  GtkEventSequenceState current_state;
 
   g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
   g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE &&
@@ -1044,13 +1043,8 @@ gtk_gesture_set_sequence_state (GtkGesture            *gesture,
       data->state != GTK_EVENT_SEQUENCE_NONE)
     return FALSE;
 
-  current_state = data->state;
   data->state = state;
 
-  if (state == GTK_EVENT_SEQUENCE_DENIED &&
-      current_state == GTK_EVENT_SEQUENCE_CLAIMED)
-    _gtk_gesture_cancel_sequence (gesture, sequence);
-
   gtk_widget_cancel_event_sequence (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)),
                                     gesture, sequence, state);
   g_signal_emit (gesture, signals[SEQUENCE_STATE_CHANGED], 0,